Fix singleton