fixed that damn hardcoded index!!