fixes #606