Fixing cleanup after async treatment of a call