Thanks! We have a lot of such code. I propose to fix them in separate patch