better fix for missing values in constant fields