Includes changes suggested in comment -> https://github.com/metabrainz/picard/pull/467#issuecomment-204583236