fix to unnecessary clear on fields