Fix wind issue reported by XiaoJie