Fix bug introduced in 3c240fe19174385e710186d65b2a25dae8b1ab65

I am really sorry. I introduced bugs in two core fields in 3c240fe19174385e710186d65b2a25dae8b1ab65