Manually Fixing Custom Traits for New Patch