Hooks fix