I am adding you much cleaner fix to our code base, and testing in the live system until a release is made. Will follow up if any issues are found. Thanks!