Fixing hook order of execution.