Fixes #294