Ah ok, I apologize, I did not understand the motivation. Let me refactor this and cross my fingers :-D