Fixed script and package