singleton fix