Scripts fix