plug leak
more KVO ugly hacks