Fixed demo (again)