Further fix for DataManager Dispatcher.