fixed fatal hooks management