Clear Handler after execution
Merge branch 'hotfix/1.0.3'

* hotfix/1.0.3:
  Clear Handler after execution