Fix until script schema