tried to improve cross-crate link reliability