Better fix for reactive scoping problem