Fixes #178

Fixes #178