fix pass fields