A small change to the condition used to check fid.