fix: data consitency fix