This should fix the hook issue