Issue #35

NB. I fixed this while investigating another issue. So there isn't a corresponding ticket on the board.

Fix for #35