Index: gotwo.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/gotwo/gotwo.module,v
retrieving revision 1.8.2.12
diff -u -p -r1.8.2.12 gotwo.module
--- gotwo.module	3 Jan 2008 21:48:10 -0000	1.8.2.12
+++ gotwo.module	19 Jan 2009 21:25:54 -0000
@@ -144,7 +144,14 @@ function _gotwo_do_redir() {
       return $page_content;
     }
     else {
-      drupal_goto($res->dst);
+      if(strpos($res->dst,'?') !== FALSE) {
+        $dsturl = substr($res->dst, 0, strpos($res->dst,'?'));
+        $dstquery = substr($res->dst, strpos($res->dst,'?') + 1);
+      } else {
+        $dsturl = $res->dst;
+        $dstquery = '';
+      }
+      drupal_goto($dsturl,$dstquery);
     }
   }
 }