I'm pretty sure this is the only change you need. Am I wrong?