Fixed a bug? where clientId was not being passed to the constructor