Major bug fix

* Fixed major bug with trait selection