Fixes #249