Demo scrips fix