fixup fall back and documentation