new bug plz fix R6