demo not fixed, but not totally broken anymore