finish event fired on req before end event
Merge branch 'bug-139'

* bug-139:
  finish event fired on req before end event