Fixed a problem with single cell wrapper