Fixed since last changes that actually broke demo