FIX: adjust index