Fixed bugs with raw data