Incorporate fix from https://github.com/daneren2005/Subsonic/commit/d7c91c48c7cfe47ca40488372f5952f31f74734e