[Bugs Fixing]