Fix bugs of #1 and #2