singleton fix & console