Demo fix (0.5h)