WIP: fix hooks.