Fixed DataModel.cpp