Fix errors introduced in 7910606b41fa480c12f305984350943757e41759