fixes #5468