Adding code properly to patch to fix LDC 431