Fixing the scope of type selection