Fixes #175