update #1, #
fixed #1, #2