fixed cell ordering issue