fixup and doc interface