Fix the bug of the serial number again