diff --git a/src/runtime/c/pgf/parser.cxx b/src/runtime/c/pgf/parser.cxx
index 7c738e452..2a5e1897c 100644
--- a/src/runtime/c/pgf/parser.cxx
+++ b/src/runtime/c/pgf/parser.cxx
@@ -1,6 +1,7 @@
 #include "data.h"
 #include "printer.h"
 #include "parser.h"
+#include "math.h"
 #include <type_traits>
 #include <map>
 #include <vector>
@@ -140,7 +141,7 @@ public:
               size_t d, Choice *choice)
     {
         this->outside_prob = item->outside_prob;
-        this->inside_prob  = item->inside_prob;
+        this->inside_prob  = item->inside_prob+choice->viterbi_prob;
         this->conts        = item->conts;
         this->lin          = item->lin;
         this->seq_index    = item->seq_index;
@@ -264,7 +265,7 @@ public:
         }
     }
 
-    virtual bool proceed(PgfParser *parser, PgfUnmarshaller *u)
+    virtual State *proceed(PgfParser *parser, PgfUnmarshaller *u)
     {
         ref<PgfSequence> seq = lin->seqs->data[seq_index];
 
@@ -275,11 +276,12 @@ public:
             symbol(parser, sym);
         }
 
-        return true;
+        return NULL;
     }
 
-    virtual void combine(PgfParser *parser, ParseItemConts *conts, PgfExpr expr, prob_t prob, PgfUnmarshaller *u)
+    virtual bool combine(PgfParser *parser, ParseItemConts *conts, PgfExpr expr, prob_t prob, PgfUnmarshaller *u)
     {
+        return false;
     }
 
     virtual void print1(PgfPrinter *printer, State *state, PgfMarshaller *m)
@@ -379,7 +381,7 @@ public:
         this->inside_prob += prob;
     }
 
-    virtual bool proceed(PgfParser *parser, PgfUnmarshaller *u)
+    virtual State *proceed(PgfParser *parser, PgfUnmarshaller *u)
     {
         size_t n_args = prod->lin->absfun->type->hypos->len;
         while (arg_index < n_args) {
@@ -398,7 +400,7 @@ public:
                         combine(parser,choice->conts,ep.first,ep.second,u);
                     }
                 }
-                return true;
+                return parser->fetch_state;
             }
 
             PgfExpr arg = u->emeta(0);
@@ -407,17 +409,21 @@ public:
             arg_index++;
         }
 
+        State *prev = parser->fetch_state;
         parent->exprs.push_back(std::pair<PgfExpr,prob_t>(expr,inside_prob));
         for (auto item : parent->items) {
-            item->combine(parser,parent->conts,expr,inside_prob,u);
+            if (item->combine(parser,parent->conts,expr,inside_prob,u)) {
+                prev = parent->conts->state;
+            }
         }
 
-        return true;
+        return prev;
     }
 
-    virtual void combine(PgfParser *parser, ParseItemConts *conts, PgfExpr expr, prob_t prob, PgfUnmarshaller *u)
+    virtual bool combine(PgfParser *parser, ParseItemConts *conts, PgfExpr expr, prob_t prob, PgfUnmarshaller *u)
     {
         parser->fetch_state->queue.push(new ExprItem(this,expr,prob,u));
+        return false;
     }
 
     virtual void print1(PgfPrinter *printer, State *state, PgfMarshaller *m)
@@ -478,10 +484,10 @@ public:
         this->next         = next;
     }
 
-    virtual bool proceed(PgfParser *parser, PgfUnmarshaller *u)
+    virtual State *proceed(PgfParser *parser, PgfUnmarshaller *u)
     {
         if (state->prev == NULL)
-            return false;
+            return NULL;
 
         if (state->choices.size() == 0) {
             State *prev = state;
@@ -499,6 +505,7 @@ public:
             prev->queue.push(new MetaItem(prev, expr,
                                           inside_prob,
                                           this));
+            return prev;
         } else {
             for (auto it : state->choices) {
                 ParseItemConts *conts = it.first;
@@ -512,8 +519,8 @@ public:
                 if (choice->items.size() == 1) {
                     prob_t prob = conts->state->viterbi_prob+inside_prob;
                     for (Production *prod : choice->prods) {
-                        conts->state->queue.push(new ExprItem(choice,
-                                                              prod, prob+prod->lin->lincat->abscat->prob, u));
+                        parser->fetch_state->queue.push(new ExprItem(choice,
+                                                                     prod, prob+prod->lin->lincat->abscat->prob, u));
                     }
                 } else {
                     for (auto ep : choice->exprs) {
@@ -521,16 +528,17 @@ public:
                     }
                 }
             }
+            return parser->fetch_state;
         }
-        return false;
     }
 
-    virtual void combine(PgfParser *parser, ParseItemConts *conts, PgfExpr expr, prob_t prob, PgfUnmarshaller *u)
+    virtual bool combine(PgfParser *parser, ParseItemConts *conts, PgfExpr expr, prob_t prob, PgfUnmarshaller *u)
     {
         conts->state->queue.push(new MetaItem(conts->state,
                                               expr,
                                               this->inside_prob+conts->field->lincat->abscat->prob+prob,
                                               this));
+        return true;
     }
 
     virtual void print1(PgfPrinter *printer, State *state, PgfMarshaller *m)
@@ -713,22 +721,18 @@ PgfExpr PgfParser::fetch(PgfDB *db, PgfUnmarshaller *u, prob_t *prob)
         fetch_state = fetch_state->next;
     }
 
-    while (fetch_state != NULL) {
-        while (!fetch_state->queue.empty()) {
-            Item *item = fetch_state->queue.top();
-            fetch_state->queue.pop();
+    while (!fetch_state->queue.empty()) {
+        Item *item = fetch_state->queue.top();
+        fetch_state->queue.pop();
 
-            item->trace(after,m);
-            if (!item->proceed(this,u)) {
-                if (fetch_state->prev == NULL) {
-                    *prob = item->get_prob();
-                    return item->get_expr(u);
-                }
-                break;
-            }
+        item->trace(after,m);
+
+        if (fetch_state->prev == NULL) {
+            *prob = item->get_prob();
+            return item->get_expr(u);
         }
 
-        fetch_state = fetch_state->prev;
+        fetch_state = item->proceed(this,u);
     }
 
     return 0;
diff --git a/src/runtime/c/pgf/parser.h b/src/runtime/c/pgf/parser.h
index aaaf5ff7e..66e586d28 100644
--- a/src/runtime/c/pgf/parser.h
+++ b/src/runtime/c/pgf/parser.h
@@ -27,8 +27,8 @@ private:
     public:
         prob_t get_prob() { return inside_prob + outside_prob; };
 
-        virtual bool    proceed(PgfParser *parser, PgfUnmarshaller *u) = 0;
-        virtual void    combine(PgfParser *parser, ParseItemConts *conts, PgfExpr expr, prob_t inside_prob, PgfUnmarshaller *u) = 0;
+        virtual State  *proceed(PgfParser *parser, PgfUnmarshaller *u) = 0;
+        virtual bool    combine(PgfParser *parser, ParseItemConts *conts, PgfExpr expr, prob_t inside_prob, PgfUnmarshaller *u) = 0;
         virtual void    print1(PgfPrinter *printer, State *state, PgfMarshaller *m) = 0;
         virtual void    print2(PgfPrinter *printer, State *state, int x, PgfMarshaller *m) = 0;
         virtual PgfExpr get_expr(PgfUnmarshaller *u) = 0;