[new model] fix parsing (still simple-minded)