Fix value binding
Make it run with different contexts