Fixed ID overlap (THOMAS!)