Corrected to string parsing bug