Fixes #12934