trying to fix app crashes
commit