Fixing clashing record fields