Fix parsing problem on more data