Get rid of unnecesari sign call