[FIX]Fixed some bags