fix the broken issue caused by haiyan