Fix regression after fixing #8