Fix for demo run