Fixed Bugs #2