fixing context