Issue 289 patch for 3.x branch

avoid saving with fallback value for empty field