Fixed Bugs

Fixed Bugs