Fixes #449