Revert "Revert "Revert "Fixed somthn in Context"""

This reverts commit bda8830cc1b45c4518587b5eca63acb6214bdbc9.