Fixed ID not being set correctly