[PD] some issues with dynamic patching