fixing data loss issue
fixing data loss issue