Small bug with index. Should be ok now!