Unlimited traits fix