Fixed REGISTRY-1609