fix parser
always return after calling
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  always return after calling
  fix parser