Making sure a the label is generated even if a field is empty

Fixes
#21