Fixed ClassDeclaration2 Logic