Fixing breaking app