Fix for incorrect context defaults