Fixes #5472