The hack does change the behavior, it makes it better¡ It takes into consideration a case the original problem didn't take. If this changes make some test fails .... good, the test was not taking a consideration of this special case.

I just wanted to merge this change ASAP, but your are right ... there is no any rush for this change, there are more work to do ;).