Fix EDKT497. In the patch: