Yes, I don't like this either. Unfortunately, this is a bit more complicated - I'll take another pass at it this weekend.