Fixed hooks are not executed anymore
Merge pull request #3113 from tucksaun/fix-hooks-execution

Hooks are not executed anymore, update #3044