Fixes #447