Now lock fields are inserted, assigned and accessed correctly