Inline model field fix to address issues #417, #418