BUG Fix duplicate fields appearing
Fixes #85