Fixed cellids indexing bug