Fixed logic around changing game