[FIX]: fix a issue based on review