Locking problem solved