Fix for TFS #246499
Merge pull request #1634 from sethmanheim/working

Fix for TFS #246499