Fix hooks for