[COMMIT] fix data loss from i.c