fix for missing context when embedding broker