- fix app crashing in some cases
