Fixes #237

Fixes for #237