Adapting to new rmcommon 2.2