remove rb, need fix