The same change here and in #447 ?