Fix for exhaustion not going away in --simulation