Solve issue in demo project & update JS file