Patch looks good... I'll need to test it to verify it worked in tools.