Fixing sample application