Reasonably sure I fixed #192
Merge pull request #193 from Align/Graham-apr-2

Reasonably sure I fixed #192