not sure if we also want to make the change here .. but I guess it would be consistent to do so.