Issue251

Fixes #251