GR 42 - restrict fields

@twinge, please review
Maybe, but if that's true that probably a bug unrelated to GR-42