[[ RefactorSyntax ]] Fixed stack corruption on saving