2nd half of fix from John Hay