     if lookup.property?
       {latestMarker, historyMarker} = @_getMarkersByUuid(lookup.property.uuid)
     else if lookup.index?
-      {latestMarker, historyMarker} = @_getMarkersByIndex(lookup.index)
+      {latestMarker, historyMarker} = @_getMarkersByIndex(lookup.index, lookup.event)
     else
       log.error "Don't know how to retrieve marker with lookup #{lookup}"
 

    {latestMarker, historyMarker}


  _getMarkersByIndex: (index) ->
    latestMarker = @$scope.latestSnippetVersion.data('markers')[index]
    historyMarker = @$scope.historyVersionSnippet.data('markers')[index]

    {latestMarker, historyMarker}


    @$scope.$on 'leafletDirectiveMarker.mouseover', (e, args) =>
      @highlightMarker
        index: +args.markerName
        event: args.leafletEvent
    @$scope.$on 'leafletDirectiveMarker.mouseout', (e, args) =>
      @unHighlightMarker
        index: +args.markerName
        event: args.leafletEvent


  highlightMarker: (lookup) ->
    if lookup.property?
      {latestMarker, historyMarker} = @_getMarkersByUuid(lookup.property.uuid)
    else if lookup.index?
      {latestMarker, historyMarker} = @_getMarkersByIndex(lookup.index, lookup.event)
    else
      log.error "Don't know how to retrieve marker with lookup #{lookup}"

