Fix bug with queue cells