Again small fix of new handling.