FIX SOME BUG