Demo fix + overflow bug