bug fix in Simulation::updateData
branch merge