CustomerRegistry Fix