fixes #5318