Properly handle forward port collision detection with auto-correct
[GH-1472]