Make sure the controller context is always there