fix Issue 13321 - Wrong goto skips declaration error