server: even better leak fix