fixes #4709