Fix exception due to CallSelection refactoring