Emergency fix for rid_list