For my feeling we can go with it like it is. I am exited to see how the code will look like after Nazar's changes. It is likely that this issue is gone after that. So no need for a change now.