Re-fix index operators