   # triggering actions
   _handlePopstate: (event) ->
     unless document.readyState is 'complete' then return
-    @_setLocations @_buildLocation()
-    return
-
-  # NOTE: mplementation basically from visionmedia/pagejs
+    # location *without* basepath and hashbang:
+    location = @_basepathStrip @_hashbangStrip @_buildLocation()
+    Nav.state = event.state
+    @_setLocations location
+    return
+
+  # NOTE: implementation basically from visionmedia/pagejs
   # listener for click events. filters out clicks which we ignore handling
   # such as 'mailto:'.
   _handleClick: (event) ->


    return

  # create a new state by pushing it onto history and then set the new location
  _newState: (location, state) ->
    unless location?
      location = state?.location ? @_buildLocation()
    Nav.state = state
    @history.pushState state, document.title, location
    @_setLocations location
    return true

  # get the origin of the current location URL


    path = @_elementPath el

    event.preventDefault()

    if path is @location then return # if new path is same as old path...
