some more leak hunting