Handle special case in raw data