Fixed workspace locking
Fixed workspace locking