Bug fix with client registration