Fixed ID bugs