Fix: Regression after renaming of fields