Fixed sample app