Help support non-resident trapping in SD