kind of fix for some fields on contract model
Merge branch 'contract'