Fix to use hooks when watching.