Bug fix wtp