Fix regression introduced by a merge #42