fixes #5074