Fixed lock when op is completed