Better fix for #11799