APPLICATION CRASH FIX