account model fixed