fixed script ordering