Fixes #439.