diff --git a/core/tags.cpp b/core/tags.cpp
index 04348c9d..b6a0357a 100644
--- a/core/tags.cpp
+++ b/core/tags.cpp
@@ -384,7 +384,7 @@ void tagdb :: remove_track(unsigned int track_id)
 void tagdb :: remove_library(unsigned int library_id)
 {
 	Database<Track>::iterator it;
-	for (it = track_db.begin(); it != track_db.end(); it++) {
+	for (it = track_db.begin(); it != track_db.end(); it = track_db.next(it)) {
 		if ((*it)->library->id == library_id)
 			track_db.remove((*it)->id);
 	}