fixes #4370