Another fix with raw