It looks like this was a little bit of a deeper issue then what I had first thought. Working on this now, but it looks to be a bit complicated so I don't think I'll be able to post the fix, but it will be in 7.0.1.