Minor change to avoid infinite loop