fix hooks
Merge branch 'fix-hooks'