fixing context  issue