[Bug Fix in Scripts]