Map issue in registry fixed