Correct version of D16821