Fixed post revert messiness