Small fix for TFS 0.3/0.4