Really fix singleton?