Fix Bug for Demo Customer