removed locked being always true