ensure modifier fields are properly tracked