change fields position #577