Fixes #249
Closes #249