Fixed bug related to cell id. (Thanks Ben)