even more fixing of the script