Following commitment in #189: - Write a test to continually check this functionality (to make sure fields don't change without realising) - Attempt to upstream this change