fixed some more - now it crashes after switching ;)