Fix for demo to work