Fixed raw code