rx client fixup