Fixed calling next...