Base fix after replacing the Script class