Quick fix for the Sample App