Fix for issue #2 (Fields can be set multiple times)