Fix for demo