fixes #2325