True that it is a bit brutal. I can write a TODO and go back at this if it is an important feature to have.