Fix singleton issue