fixes #604