Fixed Bugs.