Don't replace this with the original because it is the working version for signature