Another attempt to fix #exclude_unwanted_models