fixes #5334