Fixed Bugs #1

First Debugging