fixes #5208