fixing more guarnatee linking stuff