Fix singelton pattern