Fixes #12774