better patch for unverified_context