Fixed line issues with RVS