fixes #5559