Demo fix