For this lines, look at #1126.

I commented the second validates because some tests are failing with that modification.