Fix cellcounter/cellcounter#321