Fix Sample App