what is the logic behind this change?  are we sure there is no side effects caused by this?