I don't think this change is related to the bug, but anyway ..