fix in native windo submit logic