diff --git a/common/fp_lib_table.cpp b/common/fp_lib_table.cpp
index 46a9e8e1f6..9aa049dd78 100644
--- a/common/fp_lib_table.cpp
+++ b/common/fp_lib_table.cpp
@@ -241,7 +241,7 @@ long long FP_LIB_TABLE::GenerateTimestamp( const wxString* aNickname )
     {
         const FP_LIB_TABLE_ROW* row = FindRow( *aNickname );
         wxASSERT( (PLUGIN*) row->plugin );
-        return row->plugin->GetLibraryTimestamp( row->GetFullURI( true ) );
+        return row->plugin->GetLibraryTimestamp( row->GetFullURI( true ) ) + wxHashTable::MakeKey( *aNickname );
     }
 
     long long hash = 0;
@@ -249,7 +249,7 @@ long long FP_LIB_TABLE::GenerateTimestamp( const wxString* aNickname )
     {
         const FP_LIB_TABLE_ROW* row = FindRow( nickname );
         wxASSERT( (PLUGIN*) row->plugin );
-        hash += row->plugin->GetLibraryTimestamp( row->GetFullURI( true ) );
+        hash += row->plugin->GetLibraryTimestamp( row->GetFullURI( true ) ) + wxHashTable::MakeKey( nickname );
     }
 
     return hash;