I think this change is good...