fixes #5569