Fix for TMRegistry:300