Fix broken selection