fixed case of nil affected fields