quick fix application uac bug
merge