fix serious application error
merge