Fix recycling field keys (fixes #2140)