Scripts fix for evaluation