Fixes #5220