More fix on the script