Fixes #158