Hi Phil, I was not completely happy about your fix and here is the fix I like more. It consists of 2 patches - the first one is preparational and the second one is the fix. Please, take a look. Artem.