Properly propagate BuildContext