Another fix for deffered fields
Merge branch 'hotfix/4.0.4'