Final model fix.