fixed rid/label usage