More attempts at fixing the N-state model code.......
Authored by: bugman 2011-10-12
Parent: [r14858]
Child: [r14860]
