- fix app crashing under some condition
