Bugzilla – Bug 3716
Albums listed twice when using Image files / CUE sheets
Last modified: 2008-09-15 14:39:24 UTC
Albums are being listed twice when using image files (of any format) and CUE sheets (external)... One album is correct, listing all the tracks properly (generated from the CUE). The other 'duplicate' album contains just one long track (the image file). All my tags, file names and file organization are clean and correct, I have never seen this before 6.3.0. Note: I have selected 'Tagging' as the effected component, but please change if this is incorrect.
(In reply to comment #0) > Albums are being listed twice when using image files (of any format) and CUE > sheets (external)... One album is correct, listing all the tracks properly > (generated from the CUE). The other 'duplicate' album contains just one long > track (the image file). All my tags, file names and file organization are clean > and correct, I have never seen this before 6.3.0. Note: I have selected > 'Tagging' as the effected component, but please change if this is incorrect. > I guess this bug is around for a while. At least I've seen it on several 6.2.* builds. Although I think I can provide you some details more, since I've posted a mail on the forum regarding this issue yesterday. :-) The full issue is slightly more complex and it happens also when taggin is not involved. If you store the CD as a Single File FLAC with the Album and Artist tags + CUE you will have a Full album entry + the tracks listed in the external CUE when you browse the albums. (also affects other listings like music, etc) but if you use a WAV or a non tagged flac file + cue the SlimServer also gets a little bit confused and although you wont find the duplicate entry while browsing the specific album you will be able to find the same duplicate entry in the No Album or No artist sections of the library.
What software is being used with what settings to create these FLAC + CUE files? Would it be possible to attach a sample made from a small enough image to fit, something with the headers only perhaps. I have made some images w/ cue on my own using EAC, and made them work. However, it seems this does not work for others. So, clearly my own files are not the same as others.
Most were made with EAC, using the standard setting for this kind of thing, although i have used other apps to do this in the past (forgot which one) - all are effected. Some images are FLAC and some MP3. Same problem with both. I have not seen this bug in other versions (although 6.2.2 would not display album art for CUE's, it only listed one album). There is absolutly nothing wrong with my tags or how i ripped the CD's.
I'm just asking for a sample so that I don't continue to waste my time creating my own examples, hours of debugging when I don't use flac/cue for my own collection only to have it not work for anyone but myself. No one is suggesting that anything is wrong.
Created attachment 1325 [details] sample cue I would suply an image example, but i am on 56k and dont know how to make it a small enough (headers only?) image. Sorry :). But i have attached a cue if thats any use. The album name tag in the image is the same as the 'title' in the cue. The artist tag also = 'perfomer' in the cue. Not sure if any of this really helps.
Thanks, Dominic. I don't want to stress your 56K connection. :) This class of bugs is high on my list at the moment. I'll have a try at reproducing it shortly and get back to you if I need additional info.
Created attachment 1326 [details] hackflac.pl I think this was written by Robin Bowes, and offered up as a way to take audio data out of flac files. This may work with multitrack images as well, but I'm not sure. It is worth a try, but also requires a perl interpreter...native on linux/osx, needs activePerl on windows. Don't worry too much about it, but it will be here if you are curious to try it. or someone else comes searching.
o, looks to me like something has been loas in the setting of the content type for the image files. See bug 717 for how this was handled in the past. I have a few test files working, and clear/rescan does seem to work properly sometimes, but other times a noArtist/noAlbum listing will show the image files. Looking at the songinfo for the imgae file when under no Album, the file format is blank. something not right there. I'm not sure what the expectation is regarding metadata. It may be that when using CUE sheets, that slimserver can't accept tags in the image file as well or it may be irrelevant. I simply can't recall at this time. It does seem logical to me somehow that if there is a CUE sheet with metadata, that there would be no reason for any tags in the image file itself. What purpose might they serve?
Well I'm just looking at the album and CUE sheet without even the image data so far, and I get a completely different (and still wrong) result. From the whole album flac+external CUE, when I scan, I only get one song, which even more bizarrely is track 2. I'm going to try a few more things to make sure this is a real result and see if iTunes or other installed software might be having some effect. I'll also hack up a cue sheet that goes with a smaller flac file so that I don't upset Dan by uploading 200MB of attachment.
enable d_parse logs for more detail during any scan that includes CUE sheets. when the sample is available here, I'll test with that as well so we can compare notes.
This bug definitely happens in 6.3.0, 6.3.1, and 6.5. In addition, in 6.5, the last track in the CUE file is listed twice! I obsoleted Dominic's cue because mine is easier to test with (no offense, Dominic! Mine is based on yours, but hand-hacked somewhat). Uploading my sample files in a moment.
Created attachment 1329 [details] CUE file displaying bug original name TROY.cue
Created attachment 1330 [details] mp3 file displaying bug goes with the CUE file 1329 above. Original name TROY.MP3
Created attachment 1331 [details] Sample Cuesheet
So, the real underlying bug is this: Tag information should be ignored when there is a CUE file for the MP3 or FLAC (or probably OGG).
2006-07-11 03:12:39.8183 parseList (type: cue): file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).cue 2006-07-11 03:12:39.8186 Parsing cue: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).cue 2006-07-11 03:12:39.8191 parseCUE: cuedir: [file:///F:/muzik/FLAC2/Nick%20Drake] 2006-07-11 03:12:39.8261 Reading tags to get ending time of file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac 2006-07-11 03:12:39.8281 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#0-92.3066666666667 2006-07-11 03:12:39.8288 TRACKNUM: 1 2006-07-11 03:12:39.8288 TITLE: Introduction 2006-07-11 03:12:39.8289 ARTIST: Nick Drake 2006-07-11 03:12:39.8290 ALBUM: Bryter Layter 2006-07-11 03:12:39.8291 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#92.3066666666667-318.733333333333 2006-07-11 03:12:39.8293 TRACKNUM: 2 2006-07-11 03:12:39.8294 TITLE: Hazey Jane II 2006-07-11 03:12:39.8295 ARTIST: Nick Drake 2006-07-11 03:12:39.8296 ALBUM: Bryter Layter 2006-07-11 03:12:39.8297 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#318.733333333333-604.346666666667 2006-07-11 03:12:39.8298 TRACKNUM: 3 2006-07-11 03:12:39.8299 TITLE: At The Chime Of A City Clock 2006-07-11 03:12:39.8300 ARTIST: Nick Drake 2006-07-11 03:12:39.8300 ALBUM: Bryter Layter 2006-07-11 03:12:39.8301 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#604.346666666667-896.24 2006-07-11 03:12:39.8303 TRACKNUM: 4 2006-07-11 03:12:39.8303 TITLE: One Of These Things First 2006-07-11 03:12:39.8304 ARTIST: Nick Drake 2006-07-11 03:12:39.8305 ALBUM: Bryter Layter 2006-07-11 03:12:39.8306 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#896.24-1165.58666666667 2006-07-11 03:12:39.8307 TRACKNUM: 5 2006-07-11 03:12:39.8308 TITLE: Hazey Jane I 2006-07-11 03:12:39.8309 ARTIST: Nick Drake 2006-07-11 03:12:39.8309 ALBUM: Bryter Layter 2006-07-11 03:12:39.8310 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#1165.58666666667-1367.77333333333 2006-07-11 03:12:39.8312 TRACKNUM: 6 2006-07-11 03:12:39.8312 TITLE: Bryter Layter 2006-07-11 03:12:39.8313 ARTIST: Nick Drake 2006-07-11 03:12:39.8314 ALBUM: Bryter Layter 2006-07-11 03:12:39.8315 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#1367.77333333333-1548.26666666667 2006-07-11 03:12:39.8316 TRACKNUM: 7 2006-07-11 03:12:39.8317 TITLE: Fly 2006-07-11 03:12:39.8318 ARTIST: Nick Drake 2006-07-11 03:12:39.8319 ALBUM: Bryter Layter 2006-07-11 03:12:39.8320 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#1548.26666666667-1917.36 2006-07-11 03:12:39.8321 TRACKNUM: 8 2006-07-11 03:12:39.8321 TITLE: Poor Boy 2006-07-11 03:12:39.8322 ARTIST: Nick Drake 2006-07-11 03:12:39.8323 ALBUM: Bryter Layter 2006-07-11 03:12:39.8324 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#1917.36-2142.94666666667 2006-07-11 03:12:39.8325 TRACKNUM: 9 2006-07-11 03:12:39.8326 TITLE: Northern Sky 2006-07-11 03:12:39.8327 ARTIST: Nick Drake 2006-07-11 03:12:39.8328 ALBUM: Bryter Layter 2006-07-11 03:12:39.8329 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#2142.94666666667-2366.02666666667 2006-07-11 03:12:39.8330 TRACKNUM: 10 2006-07-11 03:12:39.8331 TITLE: Sunday 2006-07-11 03:12:39.8331 ARTIST: Nick Drake 2006-07-11 03:12:39.8332 ALBUM: Bryter Layter 2006-07-11 03:12:39.8334 Creating new track for: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac 2006-07-11 03:12:39.8438 parse: calculating duration for anchor: 92.3066666666667 2006-07-11 03:12:39.8439 parse: calculating header 0, startbytes 0 and endbytes 9081425 2006-07-11 03:12:39.8935 parse: calculating duration for anchor: 226.426666666666 2006-07-11 03:12:39.8936 parse: calculating header 0, startbytes 9081425 and endbytes 31358004 2006-07-11 03:12:39.9681 parse: calculating duration for anchor: 285.613333333334 2006-07-11 03:12:39.9683 parse: calculating header 0, startbytes 31358004 and endbytes 59457558 2006-07-11 03:12:40.0540 parse: calculating duration for anchor: 291.893333333333 2006-07-11 03:12:40.0542 parse: calculating header 0, startbytes 59457558 and endbytes 88174958 2006-07-11 03:12:40.1048 parse: calculating duration for anchor: 269.34666666667 2006-07-11 03:12:40.1050 parse: calculating header 0, startbytes 88174958 and endbytes 114674144 2006-07-11 03:12:40.1213 parse: calculating duration for anchor: 202.18666666666 2006-07-11 03:12:40.1215 parse: calculating header 0, startbytes 114674144 and endbytes 134565915 2006-07-11 03:12:40.1386 parse: calculating duration for anchor: 180.49333333334 2006-07-11 03:12:40.1387 parse: calculating header 0, startbytes 134565915 and endbytes 152323427 2006-07-11 03:12:40.1889 parse: calculating duration for anchor: 369.09333333333 2006-07-11 03:12:40.1891 parse: calculating header 0, startbytes 152323427 and endbytes 188636010 2006-07-11 03:12:40.2328 parse: calculating duration for anchor: 225.58666666667 2006-07-11 03:12:40.2330 parse: calculating header 0, startbytes 188636010 and endbytes 210829948 2006-07-11 03:12:40.2649 parse: calculating duration for anchor: 223.08 2006-07-11 03:12:40.2650 parse: calculating header 0, startbytes 210829948 and endbytes 232777272 2006-07-11 03:12:40.2968 returning: 10 items 2006-07-11 03:12:40.5853 parseList (type: cue): file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).cue 2006-07-11 03:12:40.5854 Parsing cue: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).cue 2006-07-11 03:12:40.5860 parseCUE: cuedir: [file:///F:/muzik/FLAC2/Nick%20Drake] 2006-07-11 03:12:40.5929 Reading tags to get ending time of file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac 2006-07-11 03:12:40.6301 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#0-92.3066666666667 2006-07-11 03:12:40.6303 TRACKNUM: 1 2006-07-11 03:12:40.6304 TITLE: Introduction 2006-07-11 03:12:40.6305 ARTIST: Nick Drake 2006-07-11 03:12:40.6306 ALBUM: Bryter Layter 2006-07-11 03:12:40.6307 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#92.3066666666667-318.733333333333 2006-07-11 03:12:40.6308 TRACKNUM: 2 2006-07-11 03:12:40.6309 TITLE: Hazey Jane II 2006-07-11 03:12:40.6310 ARTIST: Nick Drake 2006-07-11 03:12:40.6310 ALBUM: Bryter Layter 2006-07-11 03:12:40.6311 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#318.733333333333-604.346666666667 2006-07-11 03:12:40.6313 TRACKNUM: 3 2006-07-11 03:12:40.6313 TITLE: At The Chime Of A City Clock 2006-07-11 03:12:40.6314 ARTIST: Nick Drake 2006-07-11 03:12:40.6315 ALBUM: Bryter Layter 2006-07-11 03:12:40.6316 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#604.346666666667-896.24 2006-07-11 03:12:40.6317 TRACKNUM: 4 2006-07-11 03:12:40.6318 TITLE: One Of These Things First 2006-07-11 03:12:40.6319 ARTIST: Nick Drake 2006-07-11 03:12:40.6320 ALBUM: Bryter Layter 2006-07-11 03:12:40.6321 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#896.24-1165.58666666667 2006-07-11 03:12:40.6322 TRACKNUM: 5 2006-07-11 03:12:40.6323 TITLE: Hazey Jane I 2006-07-11 03:12:40.6324 ARTIST: Nick Drake 2006-07-11 03:12:40.6325 ALBUM: Bryter Layter 2006-07-11 03:12:40.6326 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#1165.58666666667-1367.77333333333 2006-07-11 03:12:40.6327 TRACKNUM: 6 2006-07-11 03:12:40.6328 TITLE: Bryter Layter 2006-07-11 03:12:40.6329 ARTIST: Nick Drake 2006-07-11 03:12:40.6330 ALBUM: Bryter Layter 2006-07-11 03:12:40.6331 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#1367.77333333333-1548.26666666667 2006-07-11 03:12:40.6332 TRACKNUM: 7 2006-07-11 03:12:40.6333 TITLE: Fly 2006-07-11 03:12:40.6334 ARTIST: Nick Drake 2006-07-11 03:12:40.6334 ALBUM: Bryter Layter 2006-07-11 03:12:40.6335 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#1548.26666666667-1917.36 2006-07-11 03:12:40.6337 TRACKNUM: 8 2006-07-11 03:12:40.6338 TITLE: Poor Boy 2006-07-11 03:12:40.6338 ARTIST: Nick Drake 2006-07-11 03:12:40.6339 ALBUM: Bryter Layter 2006-07-11 03:12:40.6340 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#1917.36-2142.94666666667 2006-07-11 03:12:40.6341 TRACKNUM: 9 2006-07-11 03:12:40.6342 TITLE: Northern Sky 2006-07-11 03:12:40.6343 ARTIST: Nick Drake 2006-07-11 03:12:40.6344 ALBUM: Bryter Layter 2006-07-11 03:12:40.6345 URL: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#2142.94666666667-2366.02666666667 2006-07-11 03:12:40.6346 TRACKNUM: 10 2006-07-11 03:12:40.6347 TITLE: Sunday 2006-07-11 03:12:40.6348 ARTIST: Nick Drake 2006-07-11 03:12:40.6349 ALBUM: Bryter Layter 2006-07-11 03:12:40.6351 Creating new track for: file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac 2006-07-11 03:12:40.6392 Deleting previous entry for file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#0-92.3066666666667 2006-07-11 03:12:40.6888 Deleting previous entry for file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#92.3066666666667-318.733333333333 2006-07-11 03:12:40.6979 Deleting previous entry for file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#318.733333333333-604.346666666667 2006-07-11 03:12:40.7080 Deleting previous entry for file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#604.346666666667-896.24 2006-07-11 03:12:40.7173 Deleting previous entry for file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#896.24-1165.58666666667 2006-07-11 03:12:40.7258 Deleting previous entry for file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#1165.58666666667-1367.77333333333 2006-07-11 03:12:40.7582 Deleting previous entry for file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#1367.77333333333-1548.26666666667 2006-07-11 03:12:40.7671 Deleting previous entry for file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#1548.26666666667-1917.36 2006-07-11 03:12:40.7765 Deleting previous entry for file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#1917.36-2142.94666666667 2006-07-11 03:12:40.7854 Deleting previous entry for file:///F:/muzik/FLAC2/Nick%20Drake/Nick.Drake.-.Bryter.Layter.(Remastered).flac#2142.94666666667-2366.02666666667 2006-07-11 03:12:40.7940 parse: calculating duration for anchor: 92.3066666666667 2006-07-11 03:12:40.7941 parse: calculating header 0, startbytes 0 and endbytes 9081425 2006-07-11 03:12:40.8125 parse: calculating duration for anchor: 226.426666666666 2006-07-11 03:12:40.8126 parse: calculating header 0, startbytes 9081425 and endbytes 31358004 2006-07-11 03:12:40.8318 parse: calculating duration for anchor: 285.613333333334 2006-07-11 03:12:40.8319 parse: calculating header 0, startbytes 31358004 and endbytes 59457558 2006-07-11 03:12:40.8912 parse: calculating duration for anchor: 291.893333333333 2006-07-11 03:12:40.8914 parse: calculating header 0, startbytes 59457558 and endbytes 88174958 2006-07-11 03:12:40.9190 parse: calculating duration for anchor: 269.34666666667 2006-07-11 03:12:40.9192 parse: calculating header 0, startbytes 88174958 and endbytes 114674144 2006-07-11 03:12:40.9365 parse: calculating duration for anchor: 202.18666666666 2006-07-11 03:12:40.9366 parse: calculating header 0, startbytes 114674144 and endbytes 134565915 2006-07-11 03:12:40.9852 parse: calculating duration for anchor: 180.49333333334 2006-07-11 03:12:40.9853 parse: calculating header 0, startbytes 134565915 and endbytes 152323427 2006-07-11 03:12:41.0351 parse: calculating duration for anchor: 369.09333333333 2006-07-11 03:12:41.0352 parse: calculating header 0, startbytes 152323427 and endbytes 188636010 2006-07-11 03:12:41.0523 parse: calculating duration for anchor: 225.58666666667 2006-07-11 03:12:41.0524 parse: calculating header 0, startbytes 188636010 and endbytes 210829948 2006-07-11 03:12:41.1017 parse: calculating duration for anchor: 223.08 2006-07-11 03:12:41.1019 parse: calculating header 0, startbytes 210829948 and endbytes 232777272 2006-07-11 03:12:41.1189 returning: 10 items
(In reply to comment #15) > So, the real underlying bug is this: Tag information should be ignored when > there is a CUE file for the MP3 or FLAC (or probably OGG). > Suggestion from a consumer (unfortunatedly I'm a terrible developer). Make this a parameter that the user can configure. Even give priorities like the "educated guess tags" feature.
Dan points out this conflicts with bug 2668. So I take back my suggestion that the tag data be ignored. I suppose we have to get the tag data from the track, and yet find a way that this arrangement doesn't cause a duplicate album and spurious track listing.
what about getting the metadata needed from the main file when required, then dumping it from the db after we're done?
That is my current approach. Do we use/need the data from that file anywhere? It's marked as content type 'cur'
Probably have to just do it, and wait for those who have some crazy use for it to start complaining :) If the lists block 'cur' types, then that would solve the bogus listings ...at least in theory. My earlier test didn't seem to always show it as 'cur'. Sometimes it was blank, sometimes it came up as FLAC.
Fixed in change 8367
maybe not quite: Can't locate object method "url" via package "Class::DBI::Object::Has::Been::Deleted" at /usr/local/slimserver/6.3.x/Slim/Formats/Parse.pm line 596.
ugh. can you move that ->delete to line 454?
seem ok there: Index: Slim/Formats/Parse.pm =================================================================== --- Slim/Formats/Parse.pm (revision 8368) +++ Slim/Formats/Parse.pm (working copy) @@ -451,8 +451,11 @@ }); $lastpos = $track->secs(); + $ds->delete($track); } + + $::d_parse && msg("Couldn't get duration of $filename\n") unless $lastpos; for my $key (sort {$b <=> $a} keys %$tracks) { @@ -636,7 +639,7 @@ $track->{uc $attribute} = $basetrack->{$attribute} unless exists $track->{uc $attribute}; } - $ds->delete($basetrack); + processAnchor($track);
Subject: Re: Albums listed twice when using Image files / CUE sheets Ok - go ahead and commit that then, if it fixes the bug.
in 6.3.1 at change 8370, haven't tested trunk.
Looks like it is fixed. But server is crashing when Scan.pm scans some directories. Not sure if related: The following information is part of the event: Operation `""': no method found, argument in overloaded package Class::DBI::Object::Has::Been::Deleted at /PerlApp/Slim/Utils/Scan.pm line 397.
All - I'm reverting this change, as it causes a crash. This is fixed in 6.5