Bugfix to be able to use reserved words like `key` as fieldnames