#Fixed singleton bugs