Slightly more elegant mpd fix.