This is a part of another bug, do we want to change this in this same commit ?