I just spent two afternoons trying to fix this until I ran into this post. For the love of God Apple fix this!