Updated #parse() to be more robust