Base model fix