fixes for simulation
fixes for simulation