[finish #83736800] try to fix bug