ModelField fix. Closes #2018.