Fixes #450