Fixed SS units not tracking correctly