Feature/widget protocol fix