Fixed singleton implementation OMGWTFBBQ