fixes #2230