Single instances fix