Fixed bugs parsing code.