Fixed bug in CELL_LIMIT handling