I think your change is correct. Can you remove the commented code?