Make RAW mode actually work