Fixed: Field is used only by module accounting so must have a condition
on it.