Removed premature locking