Context bug fixed