fixes #5505