Fixed problem with expanded client script