fixes #614