Fixes initialization of NeoStore fields so it only happens once