bug fix for diff rollback