Add serial number fix