Fix bug of misplaced cell order