[FIX] Fixed Bugs