Fix for non-Text fields not updating