diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java
index 3392d310d5..c9f77ce50c 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java
@@ -566,8 +566,12 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
     }
 
     public boolean visit(OracleSelectQueryBlock x) {
-        print("SELECT ");
+        print("SELECT ");       
 
+        if (x.getHints().size() > 0) {           
+            printAndAccept(x.getHints(), ", ");           
+        }
+        
         if (SQLSetQuantifier.ALL == x.getDistionOption()) {
             print("ALL ");
         } else if (SQLSetQuantifier.DISTINCT == x.getDistionOption()) {
@@ -576,12 +580,6 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
             print("UNIQUE ");
         }
 
-        if (x.getHints().size() > 0) {
-            print("/*+");
-            printAndAccept(x.getHints(), ", ");
-            print("*/ ");
-        }
-
         printSelectList(x.getSelectList());
 
         if (x.getInto() != null) {
diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
index 240be1f789..6977ec3573 100644
--- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
+++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
@@ -1301,7 +1301,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter {
     public boolean visit(SQLCommentHint x) {
         print("/*");
         print(x.getText());
-        print("*/");
+        print("*/ ");
         return false;
     }
 
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java
new file mode 100644
index 0000000000..684204c344
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java
@@ -0,0 +1,36 @@
+package com.alibaba.druid.bvt.sql.oracle;
+
+import java.util.List;
+
+import com.alibaba.druid.sql.PagerUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
+import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor;
+import com.alibaba.druid.util.JdbcUtils;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+public class OracleHintTest extends TestCase {
+
+	public void test_hint1() throws Exception {
+		 String sql = "SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ distinct e.id from ord_order_item e where e.F1 = Date '2011-10-01'";
+		
+	     OracleStatementParser parser = new OracleStatementParser(sql);
+	     List<SQLStatement> statementList = parser.parseStatementList();
+	     SQLStatement stmt = statementList.get(0);
+	     
+	     StringBuilder out = new StringBuilder();
+	     stmt.accept(new OracleOutputVisitor(out, true));
+
+	     String newSQL = out.toString();	     
+	     Assert.assertEquals("SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ DISTINCT e.id\nFROM ord_order_item e\nWHERE e.F1 = DATE '2011-10-01';\n", newSQL); 
+	     
+	}
+	
+	public void test_hint2() throws Exception {
+		String sql = "SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ distinct e.id from ord_order_item e where e.F1 = Date '2011-10-01'";
+		String countSQL = PagerUtils.count(sql, JdbcUtils.ORACLE);		
+		Assert.assertEquals("SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ DISTINCT COUNT(*)\nFROM ord_order_item e\nWHERE e.F1 = DATE '2011-10-01'", countSQL);
+	}
+}