fixed stupid Goto bug
merge