Adding fix for REGISTRY-2220