Fix an issue with the direct edit of fields.

Change-Id: I13d46e5bedc67a22b99d8d9960ddb658d74a6a18