fixed a couple bugs that was cause by holding reference to dead controllers