fix for new hooks