Slightly better locking