fixes #2244