demo bug fix