Fix regression introduced by previous bug fix