#25997 Incorporated patch from codeplex (mikegates) to fix issue