Fix regression introduced by 62ce3339c514c1fc097ff355957081c0027f3bea a=@gozala