You are right and this part is well tested so we can change this and see if it breaks something.