diff --git a/Language/Haskell/HBB/Internal/GHCHighlevel.hs b/Language/Haskell/HBB/Internal/GHCHighlevel.hs
--- a/Language/Haskell/HBB/Internal/GHCHighlevel.hs
+++ b/Language/Haskell/HBB/Internal/GHCHighlevel.hs
@@ -210,10 +210,16 @@
                 hasSearchedStartLoc loc (RealSrcSpan rss) =
                     loc == (toBufLoc $ realSrcSpanStart rss)
                 hasSearchedStartLoc _   _ = False
+
+                -- TODO is it better to only use the Name-comparison?
+                -- Currently first the Name of a function is compared with
+                -- ourName and then its location...
                 
                 -- This function is used to create a generic SYB-query to collect the function
-                -- bindings (usually only one) start start at a certain location.
+                -- bindings (usually only one) that start at a certain location.
                 locateFunctionsQ :: BufLoc -> (LHsBindLR Name Name) -> FunBindAndSig
+                locateFunctionsQ _   x@(L _ (FunBind { 
+                                    fun_id = (L _ itsName) })) | (ourName == itsName) = FunBindAndSig [x] []
                 locateFunctionsQ loc x@(L l (FunBind {})) | hasSearchedStartLoc loc l = FunBindAndSig [x] []
                 -- Pattern bindings (e.g. sq :: Int -> Int = \x -> x * x)
                 -- are also collected to be able to give a clear message to the user...
diff --git a/libhbb.cabal b/libhbb.cabal
--- a/libhbb.cabal
+++ b/libhbb.cabal
@@ -9,7 +9,7 @@
 -- PVP summary:      +-+------- breaking API changes
 --                   | | +----- non-breaking API additions
 --                   | | | +--- code changes with no API change
-version:             0.4.0.0
+version:             0.4.0.1
 
 -- A short (one-line) description of the package.
 synopsis:            Backend for text editors to provide better Haskell editing support.