Thanks for the response Gunnar. I would very much like to contribute a fix, however, am working on new product development at the moment and on a pretty tight schedule. I will try and find some time to create the fix but cannot promise it will be any time soon. The good thing is that the issue is not a blocker and there is a workaround that I can use for now.