Added fix for Bug 11699

Test was ran against MS.NET as well to make sure results agreed.
same here