Applying fix for REGISTRY-2033