fix for modelform
merge fix