fix bug goto
Merge origin/master