Improved WG fetch logic for issue240

Merged Zhou Fang requested to merge github/fork/linkfang/zhoufang/master/issue240 into master

Fixes issue240

Merge request reports