Re: Fix regression from 6.1.23 / 6.2.10