Adding fix for REGISTRY-2256