Put the hooks in the right execution path!!

After today's embarassement, here it comes and it works.