Fixed to allow only public fields to be brought back