Wrong indices in adressing fixed