EHN: small improvement for simulation