Fixed empty field bug