Fixes #7487