Fix to Make Sample App Work