Fixes #456