Persistent demo + persistent bugfix