Fixed serial number handling