loop on current not next