fix parsing class