Fix singleton call