 		 */
 		public function setBaseURL(baseURL:String):void
 		{
-			// get everything before first '/'
-			var beforeSlash:String = baseURL.split('/')[0];
-			// only set baseURL if there is a ':'
-			if (beforeSlash.indexOf(':') >= 0)
+			// only set baseURL if there is a ':' before first '/'
+			if (baseURL.split('/')[0].indexOf(':') >= 0)
 			{
 				// remove '?' and everything after
-				baseURL = baseURL.split('?')[0];
-				// remove last '/' and everything after
-				_baseURL = baseURL.substr(0, baseURL.lastIndexOf('/'));
+				_baseURL = baseURL.split('?')[0];
 			}
 		}
 		

	import mx.rpc.Fault;
	import mx.rpc.events.FaultEvent;
	import mx.rpc.events.ResultEvent;
	
	import weave.api.WeaveAPI;
	import weave.api.services.IURLRequestToken;

		 */
		private function addBaseURL(request:URLRequest):void
		{
			if (_baseURL)
				request.url = URLUtil.getFullURL(_baseURL, request.url);
		}
		
		/**
