fix for Demo replacing