Fixing object client/server demo