Wrong ID assignment fixed