Changed how trait toggling work.