Bug fix weilin