Properly extend links