Hopefully fix data loss issue