Suspect this to cause problem, i will revert this commit if we see a significative downgrade.