Bug 287

Fixes #287