nasty ListSet vs Set bug. split files a bit