Fixes #5224