Fixes #175

Fixes #175