[FIX] avoid updates of context dictionary, use a copy instead (2)