Fix cannot revert issue