Fix for live demo