Fixing sample app