Custom hook system fix.