Fixed whoisnext(int i)