Fixes #417