Fix singleton pattern