Fixes #154