Cleaned up problem introduced by clientId refactoring