[[ Bug 13314 ]] Rethought of the bugfix, to avoid to reset the field's block