made context explicit again
fixed small error in rule for field definitions