Fixing getInstance() return type