Fixing synchronization in the client app.