Fixed bugs

Fixed