fixes naes and link-2