fixed next for other modes