Fix the getInstance() bug