fixed hook bugs