Fix to new subclassed Hook