Fixing the Broken Border