Fix type selection