diff --git a/src/App/PropertyContainer.h b/src/App/PropertyContainer.h
index 82d73c190..949a77dc6 100644
--- a/src/App/PropertyContainer.h
+++ b/src/App/PropertyContainer.h
@@ -223,18 +223,18 @@ void _class_::init(void){\
 }
 
 #define TYPESYSTEM_SOURCE_TEMPLATE(_class_) \
+template<> Base::Type _class_::classTypeId = Base::Type::badType();  \
 template<> Base::Type _class_::getClassTypeId(void) { return _class_::classTypeId; } \
 template<> Base::Type _class_::getTypeId(void) const { return _class_::classTypeId; } \
-template<> Base::Type _class_::classTypeId = Base::Type::badType();  \
 template<> void * _class_::create(void){\
    return new _class_ ();\
 }
 
 #define PROPERTY_SOURCE_TEMPLATE(_class_, _parentclass_) \
 TYPESYSTEM_SOURCE_TEMPLATE(_class_);\
+template<> App::PropertyData _class_::propertyData = App::PropertyData(); \
 template<> const App::PropertyData * _class_::getPropertyDataPtr(void){return &propertyData;} \
 template<> const App::PropertyData & _class_::getPropertyData(void) const{return propertyData;} \
-template<> App::PropertyData _class_::propertyData = App::PropertyData(); \
 template<> void _class_::init(void){\
   initSubclass(_class_::classTypeId, #_class_ , #_parentclass_, &(_class_::create) ); \
   _class_::propertyData.parentPropertyData = _parentclass_::getPropertyDataPtr();\