fixing a bug where guest cells are duplicated