DSIG check and fixer #396