Fix regression introduced by merge