Fix endless loop regression of commit 'd50396a25ed24d6be1e56e84be5015bcf10f74d3'