Fix for old-school scripts