Fix for script ordering being bust