Adding fix for no value fields.