BUG FIX during app launching