fixes #4837