Fix if empty values to begin with