Locking fix