Fixed Simulation class in several templates.