fixing context issue