Fix loading of app