Fixes #283