Fixes #439