empty values support fix