Fix possible crash and modify XML file because ticker was not reliable