fix public fields