demo bug fixed