Fixing the sample app