Modeify by YC to fix the SignatureDoesNotMatch issue

Signed-off-by: YC Huang <yingchauhuang@gmail.com>