Fix for context issues