fixed all hooks