App model fix