FIX BUG SOME FEATURE
Fix bug some feature