YH-347: Fixed spatial patching