singelton instances fix