fixes #5482