Fixes #463