ihate: fix singletons (from #486, fix #411)