fix dataManager