Fix some issue during the parsing