Fixed wrapping for setCell and clearCell

Fixed wrapping cell calc for setCell and clearCell