Fixed problem with not being able to change contexts