fix - disable checking context id