Fix indexed mode