Perhaps the final fix for the link breaking bug