Yeah. I get this. Its weird, it doesn't happen all the time so i have a sneaking suspicion its a 'terrain bonus' issue/conflict.
I'll submit my savegame when i'm encountering the issue; i suggest you do the same.
So far the answer is no
Works like a charm Cal. You and the CH team are the greatest!