Why the change here?  I think this original code was OK.