[FIX]: Fixed Bugs.