fixed goto stmnt bug