RPrim + small fix