--- Schema.pm.ORIG      2014-01-17 15:53:33.541502593 +1030
+++ Schema.pm   2014-01-17 16:05:25.791287183 +1030
@@ -1017,20 +1017,20 @@
                        push @{$search}, 'albums.title = ?';
                        push @{$values}, $title;

+                       # Was: Bug 10583 - Also check musicbrainz_id if defined.
+                       # Can also be used in groupdiscs mode since id is unique per set, not per disc, now that NGS has been implemented.
+                       if (defined $brainzId) {
+                           push @{$search}, 'albums.musicbrainz_id = ?';
+                           push @{$values}, $brainzId;
+                           main::DEBUGLOG && $isDebug && $log->debug(sprintf("-- Checking for MusicBrainz Album Id: %s", $brainzId));
+                       }
+
                        # Add disc to the search criteria if needed
                        if ($checkDisc) {
                                if ($disc) {
                                        push @{$search}, 'albums.disc = ?';
                                        push @{$values}, $disc;
                                }
-
-                               # Bug 10583 - Also check musicbrainz_id if defined.
-                               # Can't be used in groupdiscs mode since id is unique per disc, not per set.
-                               if (defined $brainzId) {
-                                       push @{$search}, 'albums.musicbrainz_id = ?';
-                                       push @{$values}, $brainzId;
-                                       main::DEBUGLOG && $isDebug && $log->debug(sprintf("-- Checking for MusicBrainz Album Id: %s", $brainzId));
-                               }
                        }
                        elsif ($discc) {
                                # If we're not checking discs - ie: we're in