agree, done with last commit (+ same thing with CanonicCellEmbedder)