fix: Follow-up for #1573 to also handle the case when a non-default l…

fix: Follow-up for #1573 to also handle the case when a non-default l… #102