Deal with empty fields