Fix for the General Trait Class