Bugfix i cell_list