Fixes #1
Fix other context binding issues