switching account bug fix