Add solution for #11727