Fixed invalid ids