Make ctr mode behaviour consistent with other modes.