Fixing hook issue