I tried gazillion ways to overcome this issue including after each hook but didn't succeed. I suspect that I'm missing something simple here... maybe you can take a look at it if you have spare time?