Removed debugging stuff
Fixed bug