need to fix the client