fix some feature
fix some feature