Fixes #5193