Fixed the Hooks