 		entity.parent = entityList
 		delete entity._parentProperty
 
-		if not @_dontAutoSetCurrent and not entityList.current?
+		if not @_dontChangeCurrent and not entityList.current
 			if entity.state isnt _Entity.STATE_DELETED
 				entityList._setCurrentPage(entity._page, false)
 				entityList.setCurrent(entity)

		return

	fillData: (array)->
		@_dontChangeCurrent = true
		try
			page = @_findPage(@pageNo)
			page ?= new Page(@, @pageNo)
			@_insertElement(page, "begin")
			page.initData(array)

			if not @current and page.length
				for entity, i in entity
					if entity.state isnt _Entity.STATE_DELETED
						@setCurrent(entity)
						page.hotIndex = i
						break
		finally
			delete @_dontChangeCurrent
		return

	_setDataModel: (dataModel)->

							property: prop
						}
						@_notify(cola.constants.MESSAGE_LOADING_START, notifyArg)
						@_data[prop] = dfd = providerInvoker.invokeAsync().done((result)=>
							if @_data[prop] isnt retValue
								result = @_set(prop, result, true)
								if result and (result instanceof cola.EntityList or result instanceof cola.Entity)
									result._providerInvoker = providerInvoker

								@_notify(cola.constants.MESSAGE_LOADING_END, notifyArg)

								if property?.getListeners("load")
									property.fire("load", property, {
										entity: @
										property: prop
									})
							return
						).fail(()=>
							@_notify(cola.constants.MESSAGE_LOADING_END, notifyArg)
							return
						)

