Fixes so that it actually works with the revised hook