Patches
Plain Diff
Also added strict typing to ease debugging this kind of problems next time. issue #5531