Fix comment?  (And move lock field down next to this one).