Fix for Demo-URL