fix bugs

https://mail.google.com/mail/u/0/?shva=1#sent/1428ced8631d6805