Fix regression after 2a6896e57fe75bf667a12a93295bf3ea757191f6