Revert "Revert "fix11.12""

This reverts commit f08c230d063da16469bedef4d7910e0d6cabb612.