Fixes #358

Closes #358