Signature parsing fix?