Fixes #249
Merge pull request #253 from duncanspumpkin/fix_249

Fixes #249