Fixes #172