Fix to set empty fields method