Fixes #292