Fixed await
Fixed locking