Songs don't sort by disc number

I have a multi-disc soundtrack that I am looking at in the app, and the songs are sorted such that all of the first tracks on the discs appear first, then all the second tracks on the discs appear next, etc. The sorting algorithm should sort first by disc number, if available, and then by track number from the metadata.