Fix: Restore broken feature. One hook = One call of function per module.