Scripts Fix