Fixes #151