Fixes #605