fixed working singleton again