Fixes #451