[[ Bugfix 12088 ]] Recompute fields more often