bug fixed with azhu