Made serial number retrieval more reliable