Bugfix context wiring