Fixed race-condition with serial-identification