fix nulls assignments