leaks less, but have a bug with signatures