FIX Bug caused by mismatch index