Use local assignment first and modify field variable when necessary
Merge branch 'organisation-fixes' of github.com:dr0i/lodmill into organisation-fixes