Fixes #460