Fixes #12748