Bug fix in script 25