GR 42 - restrict fields

@twinge, please review
Existing bug, yes