Fixes #276