Cell size issue fix