Better handling of singlepart signing