This was never highly tested, that's why I never committed (my patch for this was from September 2010).
But once again I got a report that this bug was a deal-break and the patch seems to work for this artist.
I believe it's working, but I will keep my eyes open for this.