Fix for setting origin based dynamically to get the signature.