[Argha,Carlos] fixing RERVICE silliness