History and Revert fix