Fix #1336 Enhance fields update