Fixed behaviour for non eqc enabled systems.