An attempt to fix the app