Minor change to avoid loop over 1:0