Ok. I will change the patch and add unit test for this.