Fix object selection