Merge "Fixed bug with field starting with number"