Fixes #285