bugfix for context shift after update call