fixed decl enrich ordering issue