new locking mode / fix