merge fix to simulation process by riccardo mari