Fixes #153