Fix issue caused by revert