Replace return with next