Fixed TFS bug