Fixing improper  context bug.