fixing context issues