Add solution for #11044
Add solution for #11498