diff --git a/htdocs/index.php b/htdocs/index.php
index 4f8949c..eab7202 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -461,6 +461,15 @@ function load() {
 			{
 				$exec = 'show route advertising-protocol bgp '.$exec_exp[1].' table '.$table;
 			}
+			else if (preg_match("/^traceroute (ip|ipv6) ([\d\.A-Fa-f:\/]+)$/", $exec, $exec_exp))
+			{
+			    if ($routing_instance){
+                    $exec = 'traceroute '.$exec_exp[1].' routing-instance '.$routing_instance.' '.$exec_exp[2];
+                }else{
+					$exec = 'traceroute '.$exec_exp[1].' '.$exec_exp[2];
+                }
+			}
+
 		}
 
 		if ($command == 'graph')