continue patching fields null bug