Edata repacking fixed, this time for real