Fixed client
Merge