Hopefully fixed script ordering