Fixes #152