SmallData Trace Fix