fix for context passing