Fixed the hilighting issue on session load