Fix singleton_s