fix hooks for 6.0