Good point however I will not change this just now. It is not completely trivial and some tests will need to be checked.