Issue248

Fixes #248