I'm going to fixup your 2nd commit too, so it looks like you did it right the 1st time ;)