Fixes #84943988: undefined prperty  when saving entities