fixes #4674