Final fix on revert