fixed integrity error partially