Fix basic app