Fix to threading switch, add check for switching to cur