Parser and interpreter fixed