fix singleton