Fixng hook implementation that I accidentally broke