Fix for initial app