Fix field context check