Commit patch by JdGordon to fix FS#9531 (which applied to all targets) - correctly...