Fixed error in things related with singleton