That also should me fixed in another PR, shouldn't it ?