Fixes #454