Fixed ID issues