Already done in the stable version even if it doesn't exists