Fixes #167