Merge pull request #2075 from cfi-gb/add_remote_correction

Add remot->remote correction.