Deal with the return from set better