Fragment bundle fix

I'm adding a jira which reference and explain this pull request.  As with the other two pull requests, ignore the two commits that aren't mine, I don't know how I managed to make them apart of these pull requests.