Adding fix for REGISTRY-2255