Fixed based on revert