temp fix to solve topology submit issue.