dev raw bug fix