diff --git a/apps/emqtt/src/emqtt_server.erl b/apps/emqtt/src/emqtt_server.erl
index 2292d7994..c464656e3 100644
--- a/apps/emqtt/src/emqtt_server.erl
+++ b/apps/emqtt/src/emqtt_server.erl
@@ -25,6 +25,7 @@
 -author('feng@slimpp.io').
 
 -include("emqtt.hrl").
+-include("emqtt_topic.hrl").
 
 -behaviour(gen_server).
 
@@ -125,7 +126,7 @@ match(Topics) ->
     lists:flatten([match(Topic, RetainedTopics) || Topic <- Topics]).
 
 match(Topic, RetainedTopics) ->
-    case emqtt_topic:type(Topic) of
+    case emqtt_topic:type(#topic{name=Topic}) of
         direct -> %% FIXME
             [Topic];
         wildcard ->