fixed a big that happens when you switch subjects