adapt to the removal of namespace rx