add validation to fix issue with signature error