Fixed link creation with extra base