Oh shit more fixing discarded data