[feature006] popular fix