diff --git a/fulfil_client/client.py b/fulfil_client/client.py
index <HASH>..<HASH> 100755
--- a/fulfil_client/client.py
+++ b/fulfil_client/client.py
@@ -96,7 +96,8 @@ class Model(object):
     def __getattr__(self, name):
         @json_response
         def proxy_method(*args, **kwargs):
-            context = kwargs.pop('context', self.client.context)
+            context = self.client.context.copy()
+            context.update(kwargs.pop('context', {}))
             request_logger.debug(
                 "%s.%s::%s::%s" % (
                     self.model_name, name, args, kwargs
diff --git a/tests/test_fulfil_client.py b/tests/test_fulfil_client.py
index <HASH>..<HASH> 100755
--- a/tests/test_fulfil_client.py
+++ b/tests/test_fulfil_client.py
@@ -30,4 +30,4 @@ def test_find_no_filter(client):
 def test_raises_server_error(client):
     Model = client.model('ir.model')
     with pytest.raises(ServerError):
-        Model.search([], context=1)
+        Model.search(1)
Update existing context for requests

While this was the behavior on the the get request
it seems to have been forgotten on the context for
geenric method handler.