fix app crash.
conflict