Mariano's Script Fix