fixes #5506